Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 00:54:00 +0000 (16:54 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 00:54:00 +0000 (16:54 -0800)
commit5ddd7c9414bb0429160ecc9cddd3ef455c5270d4
tree4b402f989890e17dcaefa377c090c6b61b30389f
parent6bbcc1fc45109ebfebec4751241191ee3bd99079
parente5ddd386573ecd060f33a547277e79ffbe77476c
Merge from mainline.